Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge project with maintained version #133

Open
wants to merge 32 commits into
base: master
Choose a base branch
from

Conversation

mgild
Copy link

@mgild mgild commented Sep 11, 2019

No description provided.

- Implement possible fix for git 2.17 issue with string case. Suggested
a better fix for later.
- Implemented python stashed support. Is this in Haskell version? Will
have to check.
- Reorganized zshrc.sh to be a bit clearer. Few changes such as theme
and formatting to align with bash-git-prompt.
- Small tidy up to the README.
- All commands checked for bad return. No longer need stderr connected.
- Issue was a simple typo in zshrc.sh
- Revert gitstatus.py to printing on line.
- Really need to get some tests to help cover this.
- Simple logic problem was the root.
- Update gitignore, mainly usual python test dirs and stack's dirs.
- Will check for style issues and run unit tests.
- FIX: Prompt was not showing when detached HEAD.
- BUG: pytest fails from tox, will investigate.
- Tox env has no configured user information.
- Generate work folders from tempfile.
- Test on 2.7, 3.4, 3.5, 3.6.
- 3.2, 3.3 should work but getting excessive.
- 2.6.x and 3.1.x are unsupported based on code at this time.
- Simple suffix to branch name. Will appear if detached is local too.
- Travis locked to master build.
 - Remove all need for commands except for: git status --branch
 --porcelain
 - Parse porcelain capture status for repo's staged/unstaged changes.
 - Parse porcelain capture for difference from remote if set.
 - Fetch stash number and hash directly from files in .git
 - Now parsing upstream name, can be set on prompt at later date when
 changes facilitate.
- Notes for future improvements.
- When no stdin detected, fallback to running own command.
- Script aware now if in worktree or not, no visual difference in prompt
at this point.
- Ensure consistent colouring by using resets around output.
- Increase function purity by reducing global usage.
- Overhaul of tests. Clearly separate functional and integration tests.
- git_paths now resolves possible merge_file and rebase_dir, not
guaranteed to exist.
- Update README to show all possible branch states, including merging and
rebase now added.
@mgild mgild changed the title git disable optional locks Merge project with maintained version Sep 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants